<!DOCTYPE html>
<html lang="en">
<head>
	<meta charset="UTF-8">
	<title>Document</title>
</head>
<body>
<<<<<<< HEAD
	my first git control,
	Today,I meet the first snow in Beijing.
=======
	my first git control
	<h2>我胡汉三回来了!</h2>
>>>>>>> d580ac4671b46cea65dc0ba219a435b1e2aa3334
</body>
</html>